feat: added some quiz questions #99
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I absolutely hate merge conflicts :( |
|
Whenever you get the chance can you push this through. Thanks!! |
anthonydmays
approved these changes
Oct 1, 2024
marleomac3
pushed a commit
to marleomac3/code-differently-24-q4
that referenced
this pull request
Oct 2, 2024
* feat: added some quiz questions * Update quizzes.module.ts * Update quizzes.module.ts
marleomac3
pushed a commit
to marleomac3/code-differently-24-q4
that referenced
this pull request
Oct 2, 2024
* feat: added some quiz questions * Update quizzes.module.ts * Update quizzes.module.ts
marleomac3
pushed a commit
to marleomac3/code-differently-24-q4
that referenced
this pull request
Oct 2, 2024
* feat: added some quiz questions * Update quizzes.module.ts * Update quizzes.module.ts
marleomac3
pushed a commit
to marleomac3/code-differently-24-q4
that referenced
this pull request
Oct 2, 2024
* feat: added some quiz questions * Update quizzes.module.ts * Update quizzes.module.ts
anthonydmays
added a commit
that referenced
this pull request
Oct 2, 2024
* recommitting files due to branch conflict. All PR changes reflected * feat: adds Dasia's quiz questions (#114) * feat: Dasia quizz questions * fix: duplicate declaration * Fix: capitalization * Forgot to delete a line * duplicate name * feat: create test questions for Angie (#109) * answers to test * fix: rename class and file * chore: eelete lesson_03/quiz/src/quizzes/angelica_castillo_quiz.ts * changes made and saved --------- Co-authored-by: Anthony D. Mays <[email protected]> * feat: added Xavier's quiz questions (#99) * feat: added some quiz questions * Update quizzes.module.ts * Update quizzes.module.ts * feat: adds html README for Chelsea (#118) * Create chelseaogbonnia's readme * Update and rename lesson_00/chelseaogbonnia to lesson_00/chelsea_ogbonnia/ReadME.md * Rename ReadME.md to README.md * Create style.css The CSS file to make my HTML look like a Github markdown. * Created index.html This is the markdown-to-html file with semantic html practice. * Commit Message: Testing * chore: remove invalid files Signed-off-by: Anthony D. Mays <[email protected]> * Delete lesson_02/lib/typescript/codedifferently-instructional/package-lock.json --------- Signed-off-by: Anthony D. Mays <[email protected]> Co-authored-by: Anthony D. Mays <[email protected]> Co-authored-by: Anthony D. Mays <[email protected]> * feat: adds Dasia's quiz questions (#114) * feat: Dasia quizz questions * fix: duplicate declaration * Fix: capitalization * Forgot to delete a line * duplicate name * feat: create test questions for Angie (#109) * answers to test * fix: rename class and file * chore: eelete lesson_03/quiz/src/quizzes/angelica_castillo_quiz.ts * changes made and saved --------- Co-authored-by: Anthony D. Mays <[email protected]> * recommitting files due to branch conflict. All PR changes reflected * feat: adds Dasia's quiz questions (#114) * feat: Dasia quizz questions * fix: duplicate declaration * Fix: capitalization * Forgot to delete a line * duplicate name * feat: create test questions for Angie (#109) * answers to test * fix: rename class and file * chore: eelete lesson_03/quiz/src/quizzes/angelica_castillo_quiz.ts * changes made and saved --------- Co-authored-by: Anthony D. Mays <[email protected]> * feat: added Xavier's quiz questions (#99) * feat: added some quiz questions * Update quizzes.module.ts * Update quizzes.module.ts * attempting to fix merge conflicts * removed duplicate variable instances * recommitting files due to branch conflict. All PR changes reflected * removed duplicate hashes from yaml file * feat: create test questions for Angie (#109) * answers to test * fix: rename class and file * chore: eelete lesson_03/quiz/src/quizzes/angelica_castillo_quiz.ts * changes made and saved --------- Co-authored-by: Anthony D. Mays <[email protected]> * feat: added Xavier's quiz questions (#99) * feat: added some quiz questions * Update quizzes.module.ts * Update quizzes.module.ts * feat: create test questions for Angie (#109) * answers to test * fix: rename class and file * chore: eelete lesson_03/quiz/src/quizzes/angelica_castillo_quiz.ts * changes made and saved --------- Co-authored-by: Anthony D. Mays <[email protected]> * recommitting files due to branch conflict. All PR changes reflected * merge conflicts WIP * feat: added Xavier's quiz questions (#99) * feat: added some quiz questions * Update quizzes.module.ts * Update quizzes.module.ts * trying to fix yaml merge conflict --------- Signed-off-by: Anthony D. Mays <[email protected]> Co-authored-by: Dasia <[email protected]> Co-authored-by: Angelica Castillo <[email protected]> Co-authored-by: Anthony D. Mays <[email protected]> Co-authored-by: Xavier Cruz <[email protected]> Co-authored-by: Cogbonnia <[email protected]> Co-authored-by: Anthony D. Mays <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.